tests: Ensure deltas for pulling when needed

When testing pulling of deltas, use the new --require-static-deltas
option to pull-local to ensure that deltas are actually used. To support
the require-static-deltas mode, the summary in the remote repo must be
generated.

Closes: #447
Closes: #448
Approved by: cgwalters

diff --git a/tests/test-delta.sh b/tests/test-delta.sh
index 1a8f813901e998e4d113770dfa079c7349c36b01..f820965113c579cf9f57b2595e1a5de6f423f486 100755 (executable)
--- a/tests/test-delta.sh
+++ b/tests/test-delta.sh
@@ -158,8 +158,10 @@ assert_streq "${totalsize_legacy_big}" "${totalsize_legacy_little}"
 
 echo 'ok heuristic endian detection'
 
+${CMD_PREFIX} ostree --repo=repo summary -u
+
 mkdir repo2 && ${CMD_PREFIX} ostree --repo=repo2 init --mode=archive-z2
-${CMD_PREFIX} ostree --repo=repo2 pull-local repo ${newrev}
+${CMD_PREFIX} ostree --repo=repo2 pull-local --require-static-deltas repo ${newrev}
 ${CMD_PREFIX} ostree --repo=repo2 fsck
 ${CMD_PREFIX} ostree --repo=repo2 ls ${newrev} >/dev/null
 
@@ -223,10 +225,12 @@ assert_streq "${totalsize_empty}" "Total Uncompressed Size: 0 (0 bytes)"
 
 echo 'ok generate + show empty delta part'
 
+${CMD_PREFIX} ostree --repo=repo summary -u
+
 rm -rf repo2
 mkdir repo2 && ${CMD_PREFIX} ostree --repo=repo2 init --mode=archive-z2
 ${CMD_PREFIX} ostree --repo=repo2 pull-local repo ${newrev}
-${CMD_PREFIX} ostree --repo=repo2 pull-local repo ${samerev}
+${CMD_PREFIX} ostree --repo=repo2 pull-local --require-static-deltas repo ${samerev}
 ${CMD_PREFIX} ostree --repo=repo2 fsck
 ${CMD_PREFIX} ostree --repo=repo2 ls ${samerev} >/dev/null